From 33e481b28d1f32c9ba9f644886b721d3baf9d5ff Mon Sep 17 00:00:00 2001 From: "emellor@ewan" Date: Sun, 18 Sep 2005 15:50:12 +0100 Subject: [PATCH] Renamed XendDomainInfo.getTargetMemory to getMemoryTarget, for consistency with XendDomainInfo.setMemoryTarget. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/XendDomainInfo.py | 2 +- tools/python/xen/xend/image.py | 4 ++-- tools/python/xen/xend/server/SrvDomainDir.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 6979e35f31..8bc3d1a1c0 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -339,7 +339,7 @@ class XendDomainInfo: def getSsidref(self): return self.ssidref - def getTargetMemory(self): + def getMemoryTarget(self): """Get this domain's target memory size, in MiB.""" return self.memory diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index b4b9dc4810..4fe222bf88 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -313,7 +313,7 @@ class VmxImageHandler(ImageHandler): image = self.kernel, control_evtchn = self.device_channel.port2, store_evtchn = store_evtchn, - memsize = self.vm.getTargetMemory(), + memsize = self.vm.getMemoryTarget(), memmap = self.memmap_value, cmdline = self.cmdline, ramdisk = self.ramdisk, @@ -413,7 +413,7 @@ class VmxImageHandler(ImageHandler): args = args + vnc args = args + ([ "-d", "%d" % self.vm.getDomain(), "-p", "%d" % self.device_channel.port1, - "-m", "%s" % self.vm.getTargetMemory() ]) + "-m", "%s" % self.vm.getMemoryTarget() ]) args = args + self.dmargs env = dict(os.environ) env['DISPLAY'] = self.display diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py index 7f37ec7a0d..942a69ea9a 100644 --- a/tools/python/xen/xend/server/SrvDomainDir.py +++ b/tools/python/xen/xend/server/SrvDomainDir.py @@ -155,7 +155,7 @@ class SrvDomainDir(SrvDir): req.write('
  • Domain %s' % (url, d.getName(), d.getName())) req.write('id=%s' % d.getDomain()) - req.write('memory=%d'% d.getTargetMemory()) + req.write('memory=%d'% d.getMemoryTarget()) req.write('ssidref=%d'% d.getSsidref()) req.write('
  • ') req.write('') -- 2.30.2